.gitignore: Resurrect Windows-specific ignorables lost in last changes.

diff --git a/.gitignore b/.gitignore
index cd60123e1c52821b5e8e662d29de98014ca23d7e..a35ab93c8792b3a35f62a6a69edd0265e3724d02 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -102,6 +102,7 @@ src/stamp-h1
 *.dSYM/
 *.elc
 *.o
+*.res
 oo/
 oo-spd/
 src/*.map
@@ -123,6 +124,7 @@ src/bootstrap-emacs
 src/emacs
 src/emacs-[0-9]*
 src/temacs
+*.exe
 
 # Character-set info.
 admin/charsets/*.el

diff --git a/ChangeLog b/ChangeLog
index ebc14977f7f020476a680b2e775c0055cb7360e5..fdf40a172b949d5e76fdea09b94cf1e0317665d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-19  Eli Zaretskii  <eliz@gnu.org>
+
+       * .gitignore: Resurrect Windows-specific ignorables lost in last
+       changes.
+
 2014-11-19  Paul Eggert  <eggert@cs.ucla.edu>
 
        * .gitignore: Add /emacs-[1-9]*/, and sort better.